Prevent a test from seeing forbidden numbers in the rustc version #139438
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The final CHECK-NOT directive in this test was able to see past the end of the enclosing function, and find the substring 753 or 754 in the git hash in the rustc version number, causing false failures in CI. Adding an explicit check for `ret` prevents the CHECK-NOT directive from seeing past the end of the function.
|
rustbot has assigned @Mark-Simulacrum. Use |
rustbot
added
S-waiting-on-review
|
Fixes the false failure seen in #139123 (comment). cc @scottmcm via #137500, which added the CHECK-NOT directives. |
|
Doh, these hashes again. Thanks! @bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 6, 2025
Rollup of 3 pull requests Successful merges: - rust-lang#139123 (tidy: Fix paths to `coretests` and `alloctests`) - rust-lang#139347 (Only build `rust_test_helpers` for `{incremental,ui}` test suites) - rust-lang#139438 (Prevent a test from seeing forbidden numbers in the rustc version) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 6, 2025
Rollup merge of rust-lang#139438 - Zalathar:fix-test-122600, r=scottmcm Prevent a test from seeing forbidden numbers in the rustc version The final CHECK-NOT directive in this test was able to see past the end of the enclosing function, and find the substring `753` or `754` in the git hash in the rustc version number, causing false failures in CI whenever the git hash happens to contain those digits in sequence. Adding an explicit check for `ret` prevents the CHECK-NOT directive from seeing past the end of the function. --- Manually tested by adding `// CHECK-NOT: rustc` after the existing CHECK-NOT directives, and demonstrating that the new check prevents it from seeing the rustc version string.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The final CHECK-NOT directive in this test was able to see past the end of the enclosing function, and find the substring
753or754in the git hash in the rustc version number, causing false failures in CI whenever the git hash happens to contain those digits in sequence.Adding an explicit check for
retprevents the CHECK-NOT directive from seeing past the end of the function.Manually tested by adding
// CHECK-NOT: rustcafter the existing CHECK-NOT directives, and demonstrating that the new check prevents it from seeing the rustc version string.